From: Martin Abente Lahaye <martin.abente@codethink.co.uk>
Date: Thu, 11 Jul 2024 15:44:43 +0000 (-0400)
Subject: ci: Support setting libdir in install-meson-project.sh
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~226^2^2~35
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=dfafc97205876cdbb56f26da980195be7264d182;p=gnome-shell.git

ci: Support setting libdir in install-meson-project.sh

Besides building custom fedora images,  we will build
system extensions for GNOME OS. Since GNOME OS uses a
a different libdir compared to what meson defaults to,
we must allow setting libdir in this script.

See https://discourse.gnome.org/t/towards-a-better-way-to-hack-and-test-your-system-components/21075
See https://gitlab.gnome.org/GNOME/gnome-build-meta/-/issues/837

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3390>
---

diff --git a/.gitlab-ci/install-meson-project.sh b/.gitlab-ci/install-meson-project.sh
index 6d1aa90c8..3465df0ac 100755
--- a/.gitlab-ci/install-meson-project.sh
+++ b/.gitlab-ci/install-meson-project.sh
@@ -12,6 +12,7 @@ usage() {
 	  -Dkey=val      Option to pass on to meson
 	  --subdir       Build subdirectory instead of whole project
 	  --prepare      Script to run before build
+	  --libdir       Setup the project with a different libdir
 
 	  -h, --help     Display this help
 
@@ -23,6 +24,7 @@ TEMP=$(getopt \
   --options='D:h' \
   --longoptions='subdir:' \
   --longoptions='prepare:' \
+  --longoptions='libdir:' \
   --longoptions='help' \
   -- "$@")
 
@@ -50,6 +52,11 @@ while true; do
       shift 2
     ;;
 
+    --libdir)
+      MESON_OPTIONS+=( --libdir=$2 )
+      shift 2
+    ;;
+
     -h|--help)
       usage
       exit 0